Merge with http://xenbits.xensource.com/ext/xen-unstable-docs.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 10 Nov 2005 17:25:27 +0000 (18:25 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 10 Nov 2005 17:25:27 +0000 (18:25 +0100)

Trivial merge